From 2a2f1573a761a2f80e5d3af37485aa07f3ca5225 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 1 Sep 2025 01:52:47 +0200 Subject: [PATCH] rpcd: update to git openwrt-24.10 branch HEAD 8b320f9 ucode: adjust for new ext resource type e61d2be sys: use strstr() to detect installed packages bba9519 rpc-sys: packagelist: don't truncate input lines on read The removed patch was applied upstream. Link: https://github.com/openwrt/openwrt/pull/19919 Signed-off-by: Hauke Mehrtens --- package/system/rpcd/Makefile | 6 +++--- ...ode-adjust-for-new-ext-resource-type.patch | 20 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 package/system/rpcd/patches/100-ucode-adjust-for-new-ext-resource-type.patch diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index da031db849..dd2d57f6e7 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_MIRROR_HASH:=67b2cb985d8712a3e5a17ebf8c74fd35d553c8f9a4197616f9a3649a8740cc33 -PKG_SOURCE_DATE:=2024-09-17 -PKG_SOURCE_VERSION:=9f4b86e70352ab9ca6aa272d096419acc53e2390 +PKG_MIRROR_HASH:=6757b14e1b30acee50b64d70d5022ec9da6da71885df81d89b949d47790ba580 +PKG_SOURCE_DATE:=2025-09-01 +PKG_SOURCE_VERSION:=bba95191ff2f22c9118a1ba1355b83afaa277ae3 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/package/system/rpcd/patches/100-ucode-adjust-for-new-ext-resource-type.patch b/package/system/rpcd/patches/100-ucode-adjust-for-new-ext-resource-type.patch deleted file mode 100644 index 0b0acd4458..0000000000 --- a/package/system/rpcd/patches/100-ucode-adjust-for-new-ext-resource-type.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Felix Fietkau -Date: Sat, 9 Aug 2025 15:55:11 +0200 -Subject: [PATCH] ucode: adjust for new ext resource type - -ucv_resource_dataptr always returns null for resources with embedded data. - -Signed-off-by: Felix Fietkau ---- - ---- a/ucode.c -+++ b/ucode.c -@@ -449,7 +449,7 @@ rpc_ucode_script_call(struct ubus_contex - res = uc_vm_stack_pop(&script->vm); - - /* The handler function invoked a nested aync ubus request and returned it */ -- if (ucv_resource_dataptr(res, "ubus.deferred")) { -+ if (ucv_resource_data(res, "ubus.deferred")) { - /* Install guard timer in case the reply callback is never called */ - callctx->timeout.cb = rpc_ucode_request_timeout; - uloop_timeout_set(&callctx->timeout, request_timeout); -- 2.30.2